Merge tag 'upstream/0.4.0'
authorAsias He <asias.hejun@gmail.com>
Fri, 5 Apr 2013 02:51:51 +0000 (10:51 +0800)
committerAsias He <asias.hejun@gmail.com>
Fri, 5 Apr 2013 02:51:51 +0000 (10:51 +0800)
commit24aea7542dbad387873ea8121f707af85118c533
treeb6c3ebc7e1a6aa9f4bf6fe972bf28584dad4fbd8
parent834075f2aa97303e11e0dbb896eb65c0ca98bbd0
parent37b03a11b118fa9c19b34de5db6a3c2b468ec37f
Merge tag 'upstream/0.4.0'

Upstream version 0.4.0